From: Ingo Molnar Date: Mon, 28 Jul 2008 21:32:00 +0000 (+0200) Subject: Merge branch 'linus' into cpus4096 X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~27007^2 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=9e3ee1c39c0cc71222f9980ccbf87fe072897eef;p=linux-4.9.git Merge branch 'linus' into cpus4096 Conflicts: kernel/stop_machine.c Signed-off-by: Ingo Molnar --- 9e3ee1c39c0cc71222f9980ccbf87fe072897eef